From 6f18a18e886e1a4c04e99dcd382e432d44429c3f Mon Sep 17 00:00:00 2001 From: "tsteven4@gmail.com" Date: Sun, 25 Aug 2013 18:55:19 +0000 Subject: [PATCH] add error detection for navicache reader. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4568 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/navicache.cc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gpsbabel/navicache.cc b/gpsbabel/navicache.cc index 78655c7f5..0588e88b3 100644 --- a/gpsbabel/navicache.cc +++ b/gpsbabel/navicache.cc @@ -186,11 +186,19 @@ nav_read(void) reader.setDevice(&file); while (!reader.atEnd()) { - if (reader.name() == "CacheDetails" && - reader.tokenType() == QXmlStreamReader::StartElement) { - NaviReadCache(reader); + if (reader.tokenType() == QXmlStreamReader::StartElement) { + if (reader.name() == "CacheDetails") { + NaviReadCache(reader); + } } - reader.readNextStartElement(); + reader.readNext(); + } + if (reader.hasError()) { + fatal(MYNAME ":Read error: %s (%s, line %ld, col %ld)\n", + CSTR(reader.errorString()), + CSTR(file.fileName()), + (long) reader.lineNumber(), + (long) reader.columnNumber()); } } -- 2.30.2